[Fix-17847] Fix incWorkflowInstanceByStateAndWorkflowDefinitionCode not called in version 3.4.0#18082
Merged
ruanwenjun merged 20 commits intoapache:devfrom Mar 20, 2026
Merged
[Fix-17847] Fix incWorkflowInstanceByStateAndWorkflowDefinitionCode not called in version 3.4.0#18082ruanwenjun merged 20 commits intoapache:devfrom
ruanwenjun merged 20 commits intoapache:devfrom
Conversation
ruanwenjun
reviewed
Mar 19, 2026
...src/main/java/org/apache/dolphinscheduler/server/master/metrics/WorkflowInstanceMetrics.java
Outdated
Show resolved
Hide resolved
ruanwenjun
reviewed
Mar 20, 2026
Member
ruanwenjun
left a comment
ruanwenjun
left a comment
There was a problem hiding this comment.
We can revert the unrelated change of MasterCoordicator
Comment on lines
+310
to
+313
| <exclusion> | ||
| <groupId>com.vaadin.external.google</groupId> | ||
| <artifactId>android-json</artifactId> | ||
| </exclusion> |
Member
Author
There was a problem hiding this comment.
I wrote it in PR description, and there are some warning in CI.
Comment on lines
+90
to
+96
| final Long workflowDefinitionCode = | ||
| serialCommand.getWorkflowDefinitionCode() != null | ||
| ? serialCommand.getWorkflowDefinitionCode() | ||
| : workflowInstance.getWorkflowDefinitionCode(); | ||
| WorkflowInstanceMetrics.recordWorkflowInstanceFinish( | ||
| WorkflowExecutionStatus.STOP, | ||
| workflowDefinitionCode); |
Member
There was a problem hiding this comment.
Suggested change
| final Long workflowDefinitionCode = | |
| serialCommand.getWorkflowDefinitionCode() != null | |
| ? serialCommand.getWorkflowDefinitionCode() | |
| : workflowInstance.getWorkflowDefinitionCode(); | |
| WorkflowInstanceMetrics.recordWorkflowInstanceFinish( | |
| WorkflowExecutionStatus.STOP, | |
| workflowDefinitionCode); | |
| WorkflowInstanceMetrics.recordWorkflowInstanceFinish( | |
| WorkflowExecutionStatus.STOP, | |
| workflowInstance.getWorkflowDefinitionCode()); |
| projectCode: 2102 | ||
| userId: 1 | ||
| taskType: LogicFakeTask | ||
| taskParams: '{"localParams":null,"varPool":[],"shellScript":"sleep 5"}' |
Member
There was a problem hiding this comment.
Suggested change
| taskParams: '{"localParams":null,"varPool":[],"shellScript":"sleep 5"}' | |
| taskParams: '{"localParams":null,"varPool":[],"shellScript":"sleep 15"}' |
Since the serial coordinator loop interval is 5s, so we need to make sure the task can running longer than 5s, other the discard stragy might not effect.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Was this PR generated or assisted by AI?
Yes. The test was generated using gpt-5.4.
Purpose of the pull request
fix #17847
Brief change log
Verify this pull request
This pull request is code cleanup without any test coverage.
(or)
This pull request is already covered by existing tests, such as (please describe tests).
(or)
This change added tests and can be verified as follows:
(or)
Pull Request Notice
Pull Request Notice
If your pull request contains incompatible change, you should also add it to
docs/docs/en/guide/upgrade/incompatible.md